Implement simple queries for adveda
File name refactoring