Temporary workaround for not working findAllByEntityAndName(), modified some views.