added EHBO, fixed BHV query, some refactoring