Added filtering for board name and some optimizations