Enhance regexp greediness