Fix for tags search