Fixed: Broken pagination due to bad match in strstr