Changed query to use forResource in all the resource files whereever
possible