Fixing @Cacheable usage and improving performance of task search
Adding jquery map