BeanQueryTag.java fixed, test added