Fixed query #2, need to fix #4