fix to resource matching. fix to non-existent parameter fetching