Closes #54, filter string is preserved