Refactor async validator, BREAK GOOGLE MAPS!