Close #113 - updated filter logic as specified.