Fix error in filename
Improve user search
Minor corrections
Merge commit 'db47f5ea32f6cd780a65dd87b77e6b5c83d77146'