(1) removed additional testing code from query Handler (2) added
label layer support for map tool