Added ability to search properties