fixed searching when viewing paginated content.
using a better method to get "current url" when performing searches.
Merge branch '1.1' into 1.2
Merge branch '1.2'