#ARQGRA-373: Fixed resolving non-absolute locations