Small fixes & formatting.
Made fixes to ETQW query client (IdTech4) & fixed FindBugs errors.