Corrected context / location detect