added empty search results
validation and cleanup