Reverted compiler level to 1.6 to make LazyQueryContainer work with Java 6 projects
Made listener adding/removing more specific to get rid of deprecated code