Minor changes to zebramap data structures. Query mapping rules changed.