Fixed filters bug, fixed edit merchant page