fix/complete maps using user's layers, refs #831
(cherry picked from commit 49b2b7fceb2c785068c320b6974011c8f289b6b3)