Move to using id generated by sql, rather than mapname, for map identification