Updated search criteria validation, added short_id/unique_id search, all headless cukes passing