moved dataAccess queries behind query facade