Updated templates, removed array conditional on finder call