Allow type option and use city string as query