var name refactoring
add fill_query test