[PATCH 2/2] Tested both checks and switched to using filepath instead of separate file and path tags.