Added no data modal and fixed some bugs related to fitlering