Added tags to search
Fixes #52