Firefox has a decent bookmark system. What I do usually is star it (one click) and I think you need to click it again to edit it, you can then add tags to it.

Search is a lot easier then.