Proper search

Fixed search to exclude hidden properties