Fix logic around GET