Performance issues with local variables fixed + updated matching SP to produce better and more results