Fixes for quails map.
Merge commit '3cfe18daca592d1db1452a405a2591efb790e149' into quails_gmap3