filter for blank enteries added, code fixes