Close #117
Added table prefix in buildQuery model method