Grid now filters on back button, resolves #187