Add name to query
Fix the name regex