added firstName and lastName in view, form and filter