Fixed query bugs, added spinners