Improve performance
Changes in month filter and some perfomance improves
Minor improvements