Adding filtering and some assets