11 fixed bugs with dao, added js to reset filter