Filter members store using regex.

Instead of a tricky function, just create a regex and filter with that.

Plus some indentation fixes.