fixed searching by tag and text