update models
fix bug and update controller
add filter
update