make sure coms are not taken as format
Merge branch 'master' into 43-spatial-search