Changed column filters on relating tables. Closes #1