Fix phpdoc
Prevent js error
Fix sorting of apps