Pull Request Dev_1.0

please change to
```
if ($urlQuery) {
```
also po for L62, please use small letters for declaring null
```
$urlQuery = null
```