adding filter for data on front end and handling for it on back end
finishing pull of upstream changes
finish merge from pulling