Removed OR queries again, just use annotation:xyz query
Fixed a few things:
Made search display work again like it was before (images only)
Adapted UI to Web search (order of fields ,etc.)
Removed some out-commented code