Added tags to search forms