Fixed few things from subj_par query and added more restrictions.