Fix search in tags and categories

Change-Id: Ia389d517b26b03b263f4b0b6062c27afa9a50b85