+Less hard coded RequestQueryParser +few little changes